From 7262b9c0bcd2fa87bc69bc8f8b0645345dd0dc68 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 22 Sep 2009 14:11:09 +0100 Subject: [PATCH] x86: Fix the build. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 8 ++++---- xen/arch/x86/tboot.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 969550d57f..31ca46e7b5 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -421,23 +421,23 @@ static int core2_vpmu_do_wrmsr(struct cpu_user_regs *regs) core2_vpmu_save_msr_context(v, type, index, msr_content); if ( type != MSR_TYPE_GLOBAL ) { - unsigned long mask; + u64 mask; int inject_gp = 0; switch ( type ) { case MSR_TYPE_ARCH_CTRL: /* MSR_P6_EVNTSEL[0,...] */ - mask = ~((1L << 32) - 1); + mask = ~((1ull << 32) - 1); if (msr_content & mask) inject_gp = 1; break; case MSR_TYPE_CTRL: /* IA32_FIXED_CTR_CTRL */ /* 4 bits per counter, currently 3 fixed counters implemented. */ - mask = ~((1L << (3 * 4)) - 1); + mask = ~((1ull << (3 * 4)) - 1); if (msr_content & mask) inject_gp = 1; break; case MSR_TYPE_COUNTER: /* IA32_FIXED_CTR[0-2] */ - mask = ~((1L << core2_get_bitwidth_fix_count()) - 1); + mask = ~((1ull << core2_get_bitwidth_fix_count()) - 1); if (msr_content & mask) inject_gp = 1; break; diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 658c38e8f5..1dec05515d 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -72,19 +72,19 @@ typedef struct __packed { static void tboot_copy_memory(unsigned char *va, uint32_t size, unsigned long pa) { - uint32_t map_base; - unsigned long map_addr; - int i; + unsigned long map_base = 0; + unsigned char *map_addr = NULL; + unsigned int i; - map_base = 0; - for (i = 0; i < size; i++) { - if ( map_base != PFN_DOWN(pa + i) ) { + for ( i = 0; i < size; i++ ) + { + if ( map_base != PFN_DOWN(pa + i) ) + { map_base = PFN_DOWN(pa + i); set_fixmap(FIX_TBOOT_MAP_ADDRESS, map_base << PAGE_SHIFT); - map_addr = (unsigned long)fix_to_virt(FIX_TBOOT_MAP_ADDRESS); + map_addr = (unsigned char *)fix_to_virt(FIX_TBOOT_MAP_ADDRESS); } - *(va + i) = *(unsigned char *)(map_addr + pa + i - - (map_base << PAGE_SHIFT)); + va[i] = map_addr[pa + i - (map_base << PAGE_SHIFT)]; } } -- 2.30.2